From f47470a9efcf482842c823b762f4df55121293bd Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 14 May 2002 21:36:32 +0000 Subject: [PATCH] Fix format of selection data to be 8 rather than GTK_TYPE_POINTER. Tue May 14 17:30:57 2002 Owen Taylor * gtk/gtkctree.c gtk/gtkclist.c: Fix format of selection data to be 8 rather than GTK_TYPE_POINTER. (#79751, James Henstridge) * gtk/gtkmenu.c (gtk_menu_key_press): Call gtk_accelerator_valid() with cleaned up accel_key/accel_mods, not the raw values from the event. (#80513, Havoc Pennington.) * gtk/gtkmenu.c (gtk_menu_set_tearoff_state): Remove some dead code that set the tearoff window not resizable and removed decorations. (#80235) --- ChangeLog | 15 +++++++++++++++ ChangeLog.pre-2-10 | 15 +++++++++++++++ ChangeLog.pre-2-2 | 15 +++++++++++++++ ChangeLog.pre-2-4 | 15 +++++++++++++++ ChangeLog.pre-2-6 | 15 +++++++++++++++ ChangeLog.pre-2-8 | 15 +++++++++++++++ gtk/gtkclist.c | 7 ++----- gtk/gtkctree.c | 2 +- gtk/gtkmenu.c | 9 +-------- 9 files changed, 94 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23c21b7e77..5e0b387c3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Tue May 14 17:30:57 2002 Owen Taylor + + * gtk/gtkctree.c gtk/gtkclist.c: Fix format of + selection data to be 8 rather than GTK_TYPE_POINTER. + (#79751, James Henstridge) + + * gtk/gtkmenu.c (gtk_menu_key_press): Call + gtk_accelerator_valid() with cleaned up + accel_key/accel_mods, not the raw values from + the event. (#80513, Havoc Pennington.) + + * gtk/gtkmenu.c (gtk_menu_set_tearoff_state): Remove + some dead code that set the tearoff window not + resizable and removed decorations. (#80235) + Tue May 14 16:44:09 2002 Owen Taylor * gtk/gtklabel.c (gtk_label_ensure_layout): Set diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 23c21b7e77..5e0b387c3a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,18 @@ +Tue May 14 17:30:57 2002 Owen Taylor + + * gtk/gtkctree.c gtk/gtkclist.c: Fix format of + selection data to be 8 rather than GTK_TYPE_POINTER. + (#79751, James Henstridge) + + * gtk/gtkmenu.c (gtk_menu_key_press): Call + gtk_accelerator_valid() with cleaned up + accel_key/accel_mods, not the raw values from + the event. (#80513, Havoc Pennington.) + + * gtk/gtkmenu.c (gtk_menu_set_tearoff_state): Remove + some dead code that set the tearoff window not + resizable and removed decorations. (#80235) + Tue May 14 16:44:09 2002 Owen Taylor * gtk/gtklabel.c (gtk_label_ensure_layout): Set diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 23c21b7e77..5e0b387c3a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,18 @@ +Tue May 14 17:30:57 2002 Owen Taylor + + * gtk/gtkctree.c gtk/gtkclist.c: Fix format of + selection data to be 8 rather than GTK_TYPE_POINTER. + (#79751, James Henstridge) + + * gtk/gtkmenu.c (gtk_menu_key_press): Call + gtk_accelerator_valid() with cleaned up + accel_key/accel_mods, not the raw values from + the event. (#80513, Havoc Pennington.) + + * gtk/gtkmenu.c (gtk_menu_set_tearoff_state): Remove + some dead code that set the tearoff window not + resizable and removed decorations. (#80235) + Tue May 14 16:44:09 2002 Owen Taylor * gtk/gtklabel.c (gtk_label_ensure_layout): Set diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 23c21b7e77..5e0b387c3a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,18 @@ +Tue May 14 17:30:57 2002 Owen Taylor + + * gtk/gtkctree.c gtk/gtkclist.c: Fix format of + selection data to be 8 rather than GTK_TYPE_POINTER. + (#79751, James Henstridge) + + * gtk/gtkmenu.c (gtk_menu_key_press): Call + gtk_accelerator_valid() with cleaned up + accel_key/accel_mods, not the raw values from + the event. (#80513, Havoc Pennington.) + + * gtk/gtkmenu.c (gtk_menu_set_tearoff_state): Remove + some dead code that set the tearoff window not + resizable and removed decorations. (#80235) + Tue May 14 16:44:09 2002 Owen Taylor * gtk/gtklabel.c (gtk_label_ensure_layout): Set diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 23c21b7e77..5e0b387c3a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,18 @@ +Tue May 14 17:30:57 2002 Owen Taylor + + * gtk/gtkctree.c gtk/gtkclist.c: Fix format of + selection data to be 8 rather than GTK_TYPE_POINTER. + (#79751, James Henstridge) + + * gtk/gtkmenu.c (gtk_menu_key_press): Call + gtk_accelerator_valid() with cleaned up + accel_key/accel_mods, not the raw values from + the event. (#80513, Havoc Pennington.) + + * gtk/gtkmenu.c (gtk_menu_set_tearoff_state): Remove + some dead code that set the tearoff window not + resizable and removed decorations. (#80235) + Tue May 14 16:44:09 2002 Owen Taylor * gtk/gtklabel.c (gtk_label_ensure_layout): Set diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 23c21b7e77..5e0b387c3a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,18 @@ +Tue May 14 17:30:57 2002 Owen Taylor + + * gtk/gtkctree.c gtk/gtkclist.c: Fix format of + selection data to be 8 rather than GTK_TYPE_POINTER. + (#79751, James Henstridge) + + * gtk/gtkmenu.c (gtk_menu_key_press): Call + gtk_accelerator_valid() with cleaned up + accel_key/accel_mods, not the raw values from + the event. (#80513, Havoc Pennington.) + + * gtk/gtkmenu.c (gtk_menu_set_tearoff_state): Remove + some dead code that set the tearoff window not + resizable and removed decorations. (#80235) + Tue May 14 16:44:09 2002 Owen Taylor * gtk/gtklabel.c (gtk_label_ensure_layout): Set diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index 23d633a8a6..77b69a7523 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -7683,7 +7683,7 @@ gtk_clist_drag_data_received (GtkWidget *widget, gtk_drag_get_source_widget (context) == widget && selection_data->target == gdk_atom_intern ("gtk-clist-drag-reorder", FALSE) && - selection_data->format == GTK_TYPE_POINTER && + selection_data->format == 8 && selection_data->length == sizeof (GtkCListCellInfo)) { GtkCListCellInfo *source_info; @@ -7733,12 +7733,9 @@ gtk_clist_drag_data_get (GtkWidget *widget, ret_info.column = info->column; gtk_selection_data_set (selection_data, selection_data->target, - GTK_TYPE_POINTER, (guchar *) &ret_info, + 8, (guchar *) &ret_info, sizeof (GtkCListCellInfo)); } - else - gtk_selection_data_set (selection_data, selection_data->target, - GTK_TYPE_POINTER, NULL, 0); } } diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c index 3750b364fd..ef034c662b 100644 --- a/gtk/gtkctree.c +++ b/gtk/gtkctree.c @@ -6053,7 +6053,7 @@ gtk_ctree_drag_data_received (GtkWidget *widget, gtk_drag_get_source_widget (context) == widget && selection_data->target == gdk_atom_intern ("gtk-clist-drag-reorder", FALSE) && - selection_data->format == GTK_TYPE_POINTER && + selection_data->format == 8 && selection_data->length == sizeof (GtkCListCellInfo)) { GtkCListCellInfo *source_info; diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index ad43bdc63d..9d00df94ba 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -1131,13 +1131,6 @@ gtk_menu_set_tearoff_state (GtkMenu *menu, gtk_widget_realize (menu->tearoff_window); - gdk_window_set_decorations (menu->tearoff_window->window, - GDK_DECOR_ALL | - GDK_DECOR_RESIZEH | - GDK_DECOR_MINIMIZE | - GDK_DECOR_MAXIMIZE); - gtk_window_set_resizable (GTK_WINDOW (menu->tearoff_window), FALSE); - menu->tearoff_hbox = gtk_hbox_new (FALSE, FALSE); gtk_container_add (GTK_CONTAINER (menu->tearoff_window), menu->tearoff_hbox); @@ -1833,7 +1826,7 @@ gtk_menu_key_press (GtkWidget *widget, menu_shell->active_menu_item && GTK_BIN (menu_shell->active_menu_item)->child && /* no seperators */ GTK_MENU_ITEM (menu_shell->active_menu_item)->submenu == NULL && /* no submenus */ - (delete || gtk_accelerator_valid (event->keyval, event->state))) + (delete || gtk_accelerator_valid (accel_key, accel_mods))) { GtkWidget *menu_item = menu_shell->active_menu_item; gboolean locked, replace_accels = TRUE; -- 2.30.2